better mapping of markets, it is over finally :D