more addclass changes