merged and updated @nando's discount percentage from #20