added new handling of special commands