changes to fit the template