originDest check added