draft version of v1 use condition check added