Restructing the material a bit