Another 25 second test? Anyway to make this smarter?