Rolled new options to the templates. Needs to be tested!!