really updated the templates this time