rebuilt command structure