map functionality update (not complete yet)