15 and 17 updates