More tweaks to this sharing