added more scenarios