Updated with latest code.. fixed some of the flakiness I was seeing