Added --city and --date options