Changed to new gear template file