Added fixed changes