Changing payment flow and adding some goodies (angelim):