Added changes thanks to Will :-)