Added some calcs