Updated int calculations