still cleaning up new settings