refactoring ushape domain