Feature/jarvis 412