Patched the offline error and changed some naming.