bringing changes up to speed for template[master]