in class fixes