Lots of changes to fit online env