consolidated local/env sync