added >calc && >curr ty @infyhr