Added daffo and jedi