updates with more scenarios