Redo Calc Logic