Cleaned up + Improved Sharing