Put code back in, trying to fix empty branch problem