Better but buggy