storyboard and other changes
added currentIndex to pin current stop