Update Activity Calculation
Fixed localization