Modernized some stuff.