removed more offline modifiers