Slight changes and deletion of template