GUI update, changes to work with GUI