Revise topup outputs

Close #796