templates updated and working