remove seconds from 30 to 150
Merge branch 'garrison' into develop