v1.7 prepare work2