reworked 1 day limitation logic