edited class names...again