changed some comands, again