Migrate to v2.0, fixed IE9