More detail and some structure