redo of the domain thing