added two obvious classes