my changes to claw.cc file before merging