More changes for error