first version
add material - fix bugs