updated OnlineHelper to be inline with master

Double the code, double the bugs!