ST3 support

ST2/3 兼容性修改