fix the surroundings collection and rely on Surrounded.create_surroundings