Voucher and Paypal and PaymentGateway Changes