Implement reset arcs
Merge branch 'reset_arc'