consolidating classes