A bit better, but still buggy