some changes to Product