Adapted for the new interface