changed to timestamps, fixed dates