made a bit better