Update for old GUI, still needs some work