version3
After merged