more work on scenario generator