Still missing neighbor states, here and there, but seems to catch more
neighbor now