Small Structural Changes
Updated Infrastructure for Shared
Worked on Shared Calculation