make worky a bit better