Two more scenarios and some code changes