merge with GUI-v3