Improved storyboard
Improved storyboard again