Even more Bit Shifting gone