Update to work with 1.9.3. Working on 2.0