More code updated for mordern syntax.