Improved a little bit