collapsed a few classes into one