major overhaul and new multiple fields field