Added more scenarios
Added more changes