my hacks at bopm 3.1.3