and removed some more bits