changed arrival time to duration, few other syntaxy things