Upstream update and polishing