modify Factory data to be same as normal use
Merge branch modify-factory