Changed more structure.