Updated risky driver solution

Cleaned up a bit