way better but still ugh