Added state selection // changed launch flow