Storyboard setup v2