Close #36, add drinking helmet