TSAGE: Some more rework on scene 3500