Better circulator stops

Cached for one week, faster, and working better.