New function of share and fix some names