moving the hack into the template