adding some structure and links