Some changes to withdraw