merged a few classes