modified Product Container stuff