changes to track and check country and currency