added independency of currencies