fixed new stuff, classes are missing, just for showing