messing with the d4 map
fixed merge issues