Modified up to Line39