jun  12-18  function update