Changed infinite timers to conditionals- LG