oh, ok, good idea, I'll improve this...