accounted for feedback. reorganized class