Material and PST are now updated properly