numerous classes added