Removed some of the copy/paste code.