Merge rewrite of jarvis