Commented out template changes for now