Changed control structure.