Added some structure.