Modified code organisation.