Added neighborhood controller