Improved a bit, still not enough though