final design for version 2.0 done