Improving figure 2 design