added mappy stuff
fixed merge