Revert "Revert "3 local""

This reverts commit a62c6c85609f50b7764dcbc91e2b9fc2c869a45b.