Changed date to be calculated correctly