Updated work on settings command