New version to handle storyboard