Changes for Version 2.0