added 30 sec shutoff
trip line
merge conflicts