Change to numFields