Added somethings for story board