Reordered models
Model improvements