changes on some deprecated lines

changes on some deprecated lines