Adding James's updates.