Implemented new template