Added checking to prevent duplicate successes