Moved single varibles into settings varible