Update on Changes/PortingToModernC