Updated to 2.0 version