Compet: osd, part 2
Compet: modify add1
Compet: add IdWith