Made a few changes to the set-up