Merged Ron's changes with my changes