Here are the final changes