added some nice structure\!