Corrected some bugs with the scenario 2