Add the readers and add temp fix for OH calendar bugs