Some updates to upgrade to share