changed super call