Updated to take care of errors found in validation