refactored Domestic Controller done