useless template removed, models changed a bit