added "one" and "two", changed "modulo"