MADS: Refactor a bit scene 389, implement scene 399