Made returnten and subcurrency work