Add figure2 and part of uniformity