Adding Ben's code to the other classes