refactoring adapters, done with GUI adapters