Got rid of orderedFields(), using fields property directly