Started work on incremental mode