Made a couple of changes to the previous version