Stable-ish version that compiles