Mega commit de map + shyts v2.0