Fixing the online-switch and documented