Modified for change in Bionic headers