2.17.1-2: Oil lamp conversion class