fixed dates
removed date testing code