Update to 2.0; Give Credit to Tony