Modernize

Changes from greg-1-anderson