Completed calculated
Commented calculated changes