Removed cancel variable and placed in template