Changes for Schrep demo