Working on implementing short circuit.