Improved a lot :D