Trying to tweak the algorithm for dispatch callbacks
renaming files in preparation to integrating amd