added success/error messages according to spec