add update topic from statement
fixed revision
refactor test for ??
generate statement
reoreder statement list