added switch to enable using a separate set of source and destination points