modify depecated methods
modify depecated methods