Changes for the GUI