Change GUI to use
Merge branch 'local'