fix remaining functions for new format