More testing and troubleshooting...