update, I can fix some of previous classed now