Better video session logic