better currency control
merge latest