more testing and method simplification