added a few classes, not sure if it works though