Improve success and fail signals