better handle hours