More Bitshifting gone