17 and 21 updates