hopefully map part working
fixed merge errors