got bp align to work with new reworked core structure