Updated to v2.0, session control