rev 21 and 17 updates to width