merge step2 with latest framework