[ADD]: subtype instead of condition