Re-run 17 and 21