Working on fixing the discussion