99% complete updated sharing