improved a bit