Changes for Bluebird