Add haida support

Also fix shaking recovery