@dook4good: more testing