Bm35 changed from a class with static classes to a module which holds methods