Added a couple of simple changes before the real work starts