Added some more structure...