Moving some commands around