Merged Lynn's changes with mine