Updated final changes