Edited shifters to have maximum 31 bit shift