Added commented-out jedi stuff