Worked on the gui