Making demo more time aware