TODO UPDATE: decisions about Neighbourhoods, small updates