Working on the rigging