Updated some lines that might have potential problems.