generating commands enhanced.