Partial work on AD path saving bug