calendar 24-25 updated final