updated to version 2.0