Added back backup and swap settings

* Safest option I guess