moved around templates