Models fix
Template wars #2