Revamped settings, with the help of Andrew