adding pytz and date aware code