Updated follow to goto