Updated with materials