Added Jedi and some formatting