2 new scenarios 2.8 2.9 and code improvements