Added switching of currencies