update to latest patch set by nick