more updates for bluebird