add 'following' support