More Scenarios... fixed errors