JEDI ELSA and BB-8 OLAF