modified as to accomodate BTKit update