fixed demo and analyser time logic