[COMMIT] sync up pass 3