Correct scenarios

Correct scenarios and layer grpupings