17 and 18 update