Modifying the structure a bit...

not much here.