changes to Material and MaterialManager