replaced some old commands