Let's make some changes to how MBCs are implemented