Simpler testing mode that might actually work