updates up to 1.18