Added neighborhood as a parameter