I am building a crystal lattice of organic molecules. For all of the constitutent atoms OPLS-AA parameters are available. I felt that re-evaluation of partial-charges using GAMESS software with HF-6/31G* method would provide us with more accurate results, however, I later realized that OPLS-AA being a complete force-field it would be improper to modify the parameters. Am I correct or should I use re-evaulated charges ?