Modernized a bit