comment out Ostrich for now