Added changes recommended by Dale