submit error check Speeding up and validate class rename