Updated v.4.6 with more complex scenario list