Fixed all calcs!