modification for SDK revise