More template moving'