Modified the three methods to my classes