edited follow files
Merge branch 'follow'