adapted to new bmotion version