Infographic redesign
fixed merge conflict