Updated with a GUI