weekend work
removed template