Preparing version 2.0 added