Updated for panther.