Rewrote collections with promises