Updates using kevin's updates