Moved fields, changed swap function