Updated setup sequence