Changed Map syntax
Uses r-trig-trans system now, old system will not work