Added mode stuff