Added a better template