changed command structure