Modified code structure.