Changes for share function