not important
Conflict fixed
Rebuild product data construction - unfinished