Moved the calculation a little