modified which functions are delayed
attempting to merge conflicts