Making changes as per latest template