New version of NaDa
Remove after_success