update to make upstream canonical