Added full trip simulation