bpm is working
fix merge
mini commit for bpm