cleaned up date comparison and refined window for when to send a yo