updating master branch with only working scenarios