Changed calculation method