Updated calculations