Modified success and fail