merged with mapjs; console.log removed