improved a bit more