Add more transition
Fix bug in transition