Added some BP changes