templates updated and refined