Modernised things a little