original templates and checkout changes