more scenario safeguarding