Added some more claw features