Merged nop's templates in