taking out map and adding in GPS and Machete ...