updated for bluebird