Yes, also, you still need Dr Choppy to mark the location of the bunker out, so after you got the map from DW or RG, talk to the doc.
