Change keywords, comment out past line 39