removed wrapCommand method