Made shifters more efficient