Merged with Cody got changes with GUI