Version 2.0 with good figure