Full element swap version

* Removes using disabled fields