Updated commit after review by timgraham.