refactoring. now the account is in roni