MADS: Some refactoring, implement Scene 211