Calculation Changed And Registration issue fixed