implemented update by Jeff request