Update for Orca 2.2