Reworked time based messages