Improved speed. Currently debugging BinMapping