added new house logic, revised