Map(Minor Tweaks,still not working)