Slight changes and deletion of tempate