Final work on settings