Updated neighborhood controller