yr: Handle tonight and tomorrow correctly.