Added better structure.