Added discount calculations; output is now equal to last year's code