Updated, available for subclass cases