#55 domain mapping issues - simpler code