Fixes to scenario 1