clean-up. MAP_RUN added