Upstream changes
Beautiful new upstream version