updated jarvis + oscar keys