Updates to version 2.0