Map Update

- Smaller
- More effecient