updated accordingly to changes in blackbone library