A version that actually works