reorganized to start to add new materials