Added other upcoming dates and dynamic switching of target dates