more testing and debugging