Add Sofian & Chris' changes.