- Added some more share logic