rewrite code in the same manner as st3 branch