Updated calculations and errors