added final destination condition...we've been working way too long