[COMMIT] Tree sync up, pass 1