Updated to latest version 2.0