uncomment old code
refactor product and options