Added ability to switch neighborhoods