improved overall all code test:phase1