replacing deprecated week with weekOfYear