update to better template