Products adaptation ready

done