Added changes suggested by Simon