getting ready to merge dma from djk