now added substatus support