added some fuctionality to map part