Switched from then/promise to bluebird