Modified code inside