Modified the YADR commands