Move to current version 2.0