Changed date to be a Calendar instance rather than a string