reworking
reworked with list
reworked and more accounts
merging to master