Basvi-storyboard changes