fixed follower cursor and refactoring