Enhanced the share part