Jon's updates to following mechanism