update to upstream changes