changed models to reflect tweaks