improved & cleaned up smartFollow