Partial work on Chekhov redesign