more testing and simplification.