refactor for comm/ui