changes from srowen  suggestions