More work on refunds