Optimization code
followers fix #340
test code for followers #340