improved a bit more one more time