changed template, model