Feature/jarvis 302