replacing remaining curry calls with manual ones