update with latest SDK implement