Follow, and some refactoring