Map update

I'll explain all the decisions later