editing and commenting out some lines