refactored following the update to the 'Follow' api.