A version that actually works, now!