Got rid of the restitution stuff
Defining components