tweaked transition
Merge branch 'develop'