Refactor: material package - with right name..
Stop null at root
Stop null at root