Modernize this a bit.