Changed more case problems.