Checking in final changes