Added changes due to Ken Moreland feedback.