some changes to older models, implemented all models