Made a few tweaks to previous commit