Fixed bugs and updated scenario