Updated to Snipr's new map.

Lots of changes to CC