Updated for timezone support regardless of server time