added jedi back in