modified for bionic support for future deployment.