* correctly deal with changes in the account