Still buggy, but a bit better