Gc/upgrade material

:fire_engine: