improved performance
Merge branch 'models_again' into translator