minor changes in this three classes