Changes For Error Part 1