Add necessary if statement instead of overriding name