Connor fixin shit