added some updated classes