Final midterm commit for client