refactor
use new group control flow
finishs new node control bugs