Modernized code.