2.0 version, lots of changes