consolidated classes