Added code from previous class