Add modifications on code