Changed set up of grabbing commands