Updated 1.17, 1.18