Updated DOM references to make it work with 2.0