The application of Crystal Structure Prediction (CSP) to industrially-relevant molecules requires the handling of increasingly large and flexible compounds. We present a revised model for the effect of molecular flexibility on the lattice energy that removes the discontinuities and non-differentiabilities present in earlier models (Sugden et al., 2016), with a view to improving the performance of CSP. The approach is based on the concept of computing a weighted average of local models, and has been implemented within the CrystalPredictor code. Through the comparative investigation of several compounds studied in earlier literature, we show that this new model results in large reductions in computational effort (of up to 65%) and in significant increases in reliability. The approach is further applied to investigate, for the first time, the computational polymorphic landscape of flufenamic acid for Z’=1 structures, resulting in the successful identification of all three experimentally resolved polymorphs within reasonable computational time.