Modification for TimeWarp v1.0