Did a bunch of work to make it better