Made following and unfollowing more robust