modified to support new storyboard