Added: in-class modifications