working a bit better