Uppercase and small improvements
No timeout yet