Updated the following files to fixed the currency convertion issue