Final updates to version 2.0