Changes for cm bionic