Share feature working better