moved some figurs
merge