Modified for direct commands