Improve your neighbourhood form