rephrase supported scenarios
more improvements