Added some structure ...