Update to work with latest incremental