Faster transitions
Improving other versions