Tmeplates adjusted