moved calculation of restitution to material component