#9: adjust optional classes