added currencies, refactoring