simplified jarvis2. Yesterday's added functionality moved to jarvis3.