Change calculations at the end