added wtp aware