10. Minimize changes to legacy ()