New incremental code, mixed with old