Still v sketchy, but much improved version