Improved quite a bit