Made the final changes