changes on some deprecated lines