Added sharing logic