Added two modes, switchable on options page