Added some more changes and tweaks to sharing