* finish fixing merge conflict by readding my changes to dummy responder in its new location