transition issue

transition issue
Merge https://github.com/JohnMai/WhiteSharks