changes to fixtures and templates