Improve success/fail notices post duplication