removed some shifting