removed unnecessary change_list override
added sylvain's template hacks