Still a bit more work to do, but a lot better now