ErroredFields -> erroredFields
few optimizations