Updated to the version 2.0