Reduce spam, add success/fail messages