add class from 18.1