incremental
i think this fixed doublecounting