Added Auto-Calculation Tested and Working