Improved a little