Better, but still buggy.