Change duration on trip check from 7 to 2.
Use defaiultsTo() operator instead of ||