Multiple circulate bug fix cleanup
Updated extension