Finally did the same for the GUI