Adding clamps and stuff