Settings: Rewrote some code