Attempt to speed up homes controller