new verison suport both usage cases