Improved a bit..