Model projections should be correct now
Merging earlier modifications