minor structural changes for shared home controller