Modified template according to assignment sample