Fork of RigControls for contribution