changes to retrieve ip and mac address
after merge and changes