Merged with GUI