Incorporated Comments from Steve and Paul