Final changes for settings