Updating to reflect changes from original.