acu87008 some refactoring
acu87008 get rid of deprecation warning