added incremental support