another todo function missed from merge