incremental, getting close