now using my map