Completed both classes