Change to make wider range of templates