Added calculation for challenge 2