before first merge with zhao