Merge modification
set back to 60 sec the loop timer