more API tweak