Updated Jarvis :bear: