Adaptations made in class.