added a few classes