A version closer to working