Changes part1
changes part 2
Fixed product tables