Reverted and cleaned up stuff for TagAlong in order to remodel basic functionality