updated to work with version 1.8.0