fixed deprecated methods
fixed deprecated methods