Super class edited