Made some changes -- thanks Dad