Revert changes to the template... and fixed?