Edited Stuff to make GUI work again