basic BP infrastructure improved