Modernize a little bit.