Updated TODO, removed unnecessary J.clone call